Minor clean ups of time.c and partial build fixes for 2.4

diff --git a/linux-2.4-xen-sparse/arch/xen/Makefile b/linux-2.4-xen-sparse/arch/xen/Makefile
index 77da37bfaf485413f7a526f546b42e9fbcfb4813..97a622e1bd038990352c1ad0efa6d4cfc26f605a 100644 (file)
--- a/linux-2.4-xen-sparse/arch/xen/Makefile
+++ b/linux-2.4-xen-sparse/arch/xen/Makefile
@@ -61,7 +61,7 @@ SUBDIRS += arch/xen/drivers/console
 SUBDIRS += arch/xen/drivers/evtchn
 SUBDIRS += arch/xen/drivers/blkif
 SUBDIRS += arch/xen/drivers/netif
-SUBDIRS += arch/xen/drivers/usbif
+#SUBDIRS += arch/xen/drivers/usbif
 SUBDIRS += arch/xen/drivers/balloon
 ifdef CONFIG_XEN_PRIVILEGED_GUEST
 SUBDIRS += arch/xen/drivers/dom0 

diff --git a/linux-2.4-xen-sparse/mkbuildtree b/linux-2.4-xen-sparse/mkbuildtree
index 714d85e69f99ef03fc8682fdd18f3cf1a43452e2..852781bb1a8309ffc94bc4c29b7a9fcbefb6cafc 100755 (executable)
--- a/linux-2.4-xen-sparse/mkbuildtree
+++ b/linux-2.4-xen-sparse/mkbuildtree
@@ -102,8 +102,8 @@ for i in `find . -type l`; do rm -f $i; done
 relative_lndir ${RS}
 rm -f mkbuildtree
 
-set ${RS}/../linux-2.6.*-xen-sparse
-[ "$1" == "${RS}/../linux-2.6.*-xen-parse" ] && { echo "no Linux 2.6 sparse tree at ${RS}/../linux-2.6.*-xen-sparse"; exit 1; }
+set ${RS}/../linux-2.6-xen-sparse
+[ "$1" == "${RS}/../linux-2.6-xen-parse" ] && { echo "no Linux 2.6 sparse tree at ${RS}/../linux-2.6-xen-sparse"; exit 1; }
 LINUX_26="$1"
 
 

diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
index 7d600b5e1af00a99f3373fb7b06182cac1a893b2..56f6316cc47a47459b2e82291c61659a4e4a8e71 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
@@ -295,15 +295,12 @@ static inline int time_values_up_to_date(int cpu)
        struct vcpu_time_info   *src;
        struct shadow_time_info *dst;
 
-       src = &HYPERVISOR_shared_info->vcpu_time[smp_processor_id()];
-       dst = &per_cpu(shadow_time, smp_processor_id());
+       src = &HYPERVISOR_shared_info->vcpu_time[cpu]; 
+       dst = &per_cpu(shadow_time, cpu); 
 
        return (dst->version == src->time_version2);
 }
 
-#define TIME_VALUES_UP_TO_DATE \
- ({ rmb(); (shadow_time_version == HYPERVISOR_shared_info->time_version2); })
-
 /*
  * This is a special lock that is owned by the CPU and holds the index
  * register we are working with.  It is required for NMI access to the

diff --git a/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h
index 8a61a2113cd3a30bc0ba672c63b49607cfc84384..0787cc3991137fee4a5291ed6cfa5b28bfefd4c4 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h
@@ -46,6 +46,8 @@
 #  else
 #   include <asm-generic/pgtable-nopmd.h>
 #  endif
+# else
+#  define pud_t pgd_t
 # endif
 #endif